profile: Use separate names for frameclock marks instead of using details

The marks are averaged based on the name, so this makes more sense.

Also rename the map/unmap marks to have the same capitalization as
everything else.

diff --git a/gdk/gdkframeclock.c b/gdk/gdkframeclock.c
index ee76368935c07b06ad7d89f6925e706cff7bc67f..ca0bd56b87b9b6146ae40cf1ce3762e4595c41e6 100644 (file)
--- a/gdk/gdkframeclock.c
+++ b/gdk/gdkframeclock.c
@@ -664,7 +664,7 @@ _gdk_frame_clock_emit_update (GdkFrameClock *frame_clock)
   g_signal_emit (frame_clock, signals[UPDATE], 0);
 
   if (GDK_PROFILER_IS_RUNNING)
-    gdk_profiler_end_mark (before, "frameclock", "update");
+    gdk_profiler_end_mark (before, "frameclock update", NULL);
 }
 
 void
@@ -675,7 +675,7 @@ _gdk_frame_clock_emit_layout (GdkFrameClock *frame_clock)
   g_signal_emit (frame_clock, signals[LAYOUT], 0);
 
   if (GDK_PROFILER_IS_RUNNING)
-    gdk_profiler_end_mark (before, "frameclock", "layout");
+    gdk_profiler_end_mark (before, "frameclock layout", NULL);
 }
 
 void
@@ -686,7 +686,7 @@ _gdk_frame_clock_emit_paint (GdkFrameClock *frame_clock)
   g_signal_emit (frame_clock, signals[PAINT], 0);
 
   if (GDK_PROFILER_IS_RUNNING)
-    gdk_profiler_end_mark (before, "frameclock", "paint");
+    gdk_profiler_end_mark (before, "frameclock paint", NULL);
 }
 
 void
@@ -777,7 +777,7 @@ _gdk_frame_clock_add_timings_to_profiler (GdkFrameClock   *clock,
 {
   if (timings->presentation_time != 0)
     {
-      gdk_profiler_add_mark (timings->presentation_time, 0, "frameclock", "presentation");
+      gdk_profiler_add_mark (timings->presentation_time, 0, "presented window", NULL);
       gdk_profiler_set_counter (fps_counter,
                                 timings->presentation_time,
                                 frame_clock_get_fps (clock)); 

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 0d442aac8f06f9b87f9227995b4868f989242560..7c143b52ff8471a08764d5444e93b2340f3029e0 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -883,7 +883,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
           _gdk_x11_surface_grab_check_unmap (surface, xevent->xany.serial);
 
           if (GDK_PROFILER_IS_RUNNING)
-            gdk_profiler_add_markf (g_get_monotonic_time (), 0, "Unmapped window", "0x%lx", GDK_SURFACE_XID (surface));
+            gdk_profiler_add_markf (g_get_monotonic_time (), 0, "unmapped window", "0x%lx", GDK_SURFACE_XID (surface));
         }
 
       return_val = FALSE;
@@ -908,7 +908,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
 
           if (GDK_PROFILER_IS_RUNNING)
             {
-              gdk_profiler_end_markf (surface_impl->map_time, "Mapped window", "0x%lx", GDK_SURFACE_XID (surface));
+              gdk_profiler_end_markf (surface_impl->map_time, "mapped window", "0x%lx", GDK_SURFACE_XID (surface));
               surface_impl->map_time = 0;
             }
        }